Added entity packages, small cleanups