Move files and and minor cleanup