Removing redundant projects + refactoring