New files and new structure for the project