adjusted file structues (refactoring of functions)