Large Re-organisation and Import

Found all my old feeds, YAY!

Also while importing, took the time to tidy up