Moved to new package, added lua scripting