new structure from project final
remove unused files