Refactoring systems locations
Moving data tools to another project