12 - Restructure modules container