Simpl reorg

Reorganizing folder