Another update to repo structure

To further organize for use with CI server