Re-organized code structure : server code is now in master branch