moving Unit-Test files and changed travis-ci conf

I moved files around so that the tests files are in same directory as code files. Changed the travis-ci configuration so that this is running as it was before.