Move atoms and CommandObject to scaffolding plugin; Reduce calls to commons-lang & commons-logging