Moving things around for clean up
Deleted subfolder, moved to main folder