Renamed modules, and added blocksparse plotting