Re-organizing directory structure a little to make life in jenkins a little easier.