Refactoring requires and renaming some files