Moving files around

* Moving some files around
* Adding first test file