Restructuring packages and some testing.