Changed modular structure and layout. Added/cleaned up tests
Merge pull request #23 from herman-rogers/dev

Changed modular structure and layout. Added/cleaned up tests