refactor(simplification): more things moved around and simplified