Better developed project stucture