Relocate code, remove not needed files
Port to CC