Added note about NCM
Rename activity
Move packages around