Refactoring

Refactoring of parse files