Merged server and client. Separated assets directory