Reorganization + modular bash commands