Restructure and re-layout - KISS