Making the dir structure more maven like.