Moved states to its own file.  This is a test, will create architecture soon.
Merge pull request #7 from villanuevawill/master

Moved states to its own file.  This is a test, will create architecture ...