Minor changes
Removed server bits. These will go in their own packages now
Made library 'pure', server stuff will go in separate packages