Refactor to controllers!

Refactor the controllers and remove the dsstore