Initial Checkin
update
Prepare for server refactoring