Cleanup project structure; Renamespace files, methods, and symbols