Restructuring package internals