Move data stuff out
Move stuff out of server dir
Merge pull request #32 from osmlab/split

Split