Move stuff so installing is sane
Reorganization, finally plays nice