rename files and change project structure