Initial project for refactoring

Point 0 - we shall start from here