changed to 2scoops file structure