Convert module structure to fixture based setup
Merge pull request #8 from bkkrw/master

Convert module structure to fixture based setup