Feature/2 organized folder structure

Reorganized folder structure to allow new additions easily. Also fixes kvesteri/intervals#2