code simplification

- model 1 filenames a bit clearer
- put helper functions into subfolders