general: just redesigned the code layout