Resolve circular import & move Chapter, Theme
add new applications
fix models dependencies