Removed server output - buggy
Improved file structure and aded make clean
Small fixes