Merge pull request #12 from LiveOak/dev

Dev -moving up a directory
Removing old directory