Beginning to add separate files for the separate actions. It should make the project a little neater ;-)