Remove `distribution` related definitions
Rename package folders
Minor update