added projects - did some refactoring