Merge pull request #58 from stulees/master

Removing deprecated files
Merge pull request #59 from stulees/master

Reorganization of e2e/unit test infrastructure