Class/File refactoring