Projects refactored part I