successfully restructured up and running, more changes and cleaning to come