#33 clean grid subscription
#34 fix grid margin
folders reorganisation