Rearrange packages
Delete unused files