Fixed extra folders (Whoops)
Still organizing