Cleaned up server source structure