Updated project structure and added client