Moved Data Types to Controller

Moved Data Types to Controller to reach a clearer Structure