Moved 'src/client' to just 'client'