Initial commit - added module file structure and a few tests
Merging