Relocated the services to its own folder
Created a datagrid builder