Structure changes, moved everything to packages. Added utils for common
actions.