Rearranged Assets and added a few DomainEntityTests