Move datasource and test modules