Moved modules around to get rid of path hackery. Was causing intermittent problems on different machine.