Package rearrangement
Method return types altered