reorganize packages/files structure

reorganize packages/files structure along with the new architecture