Modify source files structure, delete unused files