Separate classes in different files and developed a little bit the project.