Fixed directories structure and names for the project