After significant refactoring of project