Reorganized directory hierarchy

This cleans out things a bit, but causes problems
to install the tests in the right place. Will need
to fix this.