Move files and fix formatting