Reorganize project files and code