Reorganize, prepare for refactor