Structural updates
Fleshing out setup script