Further organizing of the project