Data with code

**Depends on #571 and #578**

Move stuff in ```data/``` directory into relevant directories