Added folders. Improved style