Refactor dirs
Add two commands
Add two build commands