more renaming on imports
add cdc files
move all files up a level