Bigger refactoring applied
Single project is working