Rearranging package structure for the common entities and util classes