Autoformat
Flatten file structure. Common/client is no longer needed