Project/Git refactoring according to 25.04.2014 meeting.