cleaned up file structure. added skeletons for identity map, lazy loading
Removed portal code
Added extra spec files
resolved merge conflicts