Changed Directories to be more organized