- start refactoring of file structure