move stuff around, remove obsolete parts
modify ajay entrypoint into cli interface