First refactoring to the classes package (folder).