added reset all button
shapes: small fixes
files reorganization