Amended dir structure
Amended architecture - now more modular
Added some starting point tests
Working on docs and code