Changed the folder hirachy