Folder structure changed

Folder structure changed in order to fit to the model-view-control
pattern