New file layout to better control jar loading