Moved everything into "client" and "common" folders