Packaging & Small performance fixes

I have fixed some small performance issues, and have packaged all server
classes.