More solid Module framework in place