Did some stuff

Cleaned up some files and added some nice library loaders.