-Cleaned up a little
segments will be stored in a separate folder