Renamed classes, ran Intellij inspections.
Added some more tests.
Added constructPath method