Change structure for better package building