Again some restructureing