Changed around main file structure and comments