Re-order classes and functions. Add some debugging, prefix commands with /usr/bin