Further package reorganizations
Added license to top of package