Added and moved packages; started outlining some generalized entity implementations