Refactored source to default package