Improve source layout to leverage categories