moved modules into a sensible hierarchy and cleaned import lists