restructured user modules hierarchy