more idiomatic file structure changes
missing require
more shuffling, trying to eliminate run bash script