Restructure project files for consistency