Move dependencies around. Rearrange app. Fix configs inconsistency.