Restructured package hierarchy and added some stuff