Now project works with the new directory organization