Main file renamed to fit with separate naming struct