Revert to default file structure
move tests out of main
Run given/on only once