Move some files from root namespace in Engine to more appropriate folders/ns