Move engine code to new subdirectory
Change namespace for engine code