Change structure to better fit with freshshell