Initial mods
Reorganizing files and fixing tests
Updating phpunit config
Prepping for first Travis tests