shuffled old files into roughly the right spots
Angularized a bit o work, kept old files