Refactored fragments into their own packages