Added folders for pretty urls and better order