Reorganize package structure according to new architecture