fixed stuff
Reorganized files and added script to convert old lists
Some perms
Fixed merge issues
Merge branch 'organized_files'