updating the project to the latest modifications of the library and better folder structure