Issue base entity added & removed components folder