Make sure State pattern tests pass after directory renaming
Merge pull request #39 from sergeylukin/reorganize

Make sure State pattern tests pass after directory renaming