Merge branch 'restructuring' into 'NIFTy_5'

Restructuring models

See merge request ift/NIFTy!271
19 jobs for NIFTy_5 in 4 minutes and 4 seconds (queued for 4 seconds)