Cleaning up repository to have cleaner directory structure, no code changes were made