Move files around, remove unused code, general cleanup