Aproaching the code to original CMFGEN file structure