done refactorying base project