Moved things around a bit. Moved everything into lib and removed extras folder.