Remove files that got mixed up here
Replace query src with lib call