Reorganisation of project structure to include client side