Modularize shells