reverted almost 90% of previous commit so project still could be counted as MVC-style one