Random changes I had laying around
Flatten lib structure