Refactor wicket (presentation stuff) + added appModel folder