Merging new directions

Server is about to be changed, so new codebase will be integrated with server version.