Constants moved to own module. Added dependencies to client and server