Change package structure
Change account packages
Resolve cyclic package dependencies in account package