Some minor updates to project structure and preparing for all client events