Moved files to correct namespace directories