Reworking folder hierarchy

Made new folder hierarchy and got rid of some of the old folders