renamed modules to partials + more items