Restructured "Freud" package