Restructure modules