Restructured modules layout