Folder restructure and condensed/deleted old funs

Also added some comments to older funs before I forget what they do :)