bugfix // file structure refactoring