Add clustering and remove client/ directory (moved to seperate project)