Major refactor: merge files, merge packages, etc.