Reorganized into more usable folders, updated element6