Refactorized code;  Reworked status and data classes; Fixed YAML tests