renamed packages and fixed warnings