feat(module): change module organisation