Developer b2

Organized files into modules folder. Added helper script to top level.