Change variable names and files structure