Project architucture almost done