reestructuring of the project
edited merges