Refactored to remove additional modules for states. All states are now registered on the app module