fixed #24 - moved most of scripts into modules

Signed-off-by: Paul Marrington <paul@marrington.net>
Merge branch 'refs/heads/paul'