added inject info
cleanup and wire-up layout + facade via inject annotations
remove now obsolete classes
added missing inject annotations
added inject dependency