Re-organized whole project to create distinct modules for base, client and server parts.