Refactor packages
Some update work on ContentRegistry
Reformat and organize
More refactor