Refactoring, renaming of classes, removed NetMessages class and migrated its contents to NetMessage (didn't make any sense to have that extra class)