Move data queries over to src directory, rename clicks/for