Improved server structure
Added some toolz