Restructured directories

Still struggling to get imports right
Reorganisation beendet
run server after branch merge