WIP: add registartion feature part

Change-Id: I750acde2c89e321d32df516144e5ccb3763a4bfc
WIP: remove the old feature part

Change-Id: I28a7a98a936563dc555f5d484f4e21921421aca5