Switched to the proper directory structure