Added current structure, must still make services stateless, implement image entitiy