Implemented State Machine
Changed package name