refactoring files organization