Renames packages

Just quickly removing the unnecessary subpackages of 'src' in client and
common