Moved everything out of the redundandant subfolder