renamed main to app
renamed main to app
removed obsolete class
changes required due to cliff library changes
cleanup, most code is now implemented by cliff
updated submodules