Restructure

Recessing logic;