Refactoring. New file structure.