Restructured package, updated naming scheme