changed application name space and few more changes