Rename a few dirs, and sure break a few things
moved stuff, hopefully fixed
builds working, finally