Reorganize first design attempts
First attempt of different style for Polakoff