Restructure packages

Restructure packages to a neater format.