Resored yo generator files and moved a few files around