rename and restructure language to use proper basic lisp constructs