Preparing for package reorg
Major reorganization of packages, core/main/infra concerns changed to source folders