subdirs registry and deployment
removed OUSTR() as well and replaced .equals() with ==

Change-Id: Ib4ca45ba7fdff2179d744dac5a034dc35558d92b