Fix errors at directories structure