Changed file structure to fit 3 core analytical platforms and toolset