Reestructured with separated files. Save project when add a new folder