Added scheduler, moved and removed unneeded files