Refactored packages, fixed cache managers, fixed activator, added image keys inteface