finished refactoring
Merge branch 'refactoring' of https://github.com/AlexeyDegtyarev/FokSwimming