delete, save and simple filter done + refactor

refactor = split code in core and views folder