Changed file structure. Refactoring.