More separation changes

* Moved file checks from controller to the model
* Simplified HMAC digest comparison
* Simplified data dir specification to make for easier moves.