MOB-2141 unnecessary files deleted
MOB-2141 fixed formatting and name convention