Moving states to a better location
- Bringing all the StateMachine code in line
-- Separating out the states for various areas (just mount for now)
-- Creating base state that other states can inherit from to reduce code