Structure revamped

Major structure changes and consolidation