Altered folder structure to neaten up windows build