Refactoring and Reorganization
Added support for commands in multiple folders.