Move server to top level and client to subdir