Merge pull request #72 from andreywix/Feature-RoutesSeparation

Feature - Routes separation