moved the entity cache/manager reduce number of folders at root level
added a stack data structure