Restructure the client project to allow for a better workflow.