Structure shift

Shifting towards a cleaner structure