Baby steps towards better package/layout directory structure.