Merged class files and added initial server