move stuff to sensible locations, finally
ugh, this kind of sh*t sucks

moving folders around, fixing build problems as a result
remove stray files