Making some initial structural changes