Client project structure minor changes