includes and sources split in separated folders. Makefile updated and improved