Add some projects + refactoring