renaming code files + a little cleanup