Reestructuring a little the project