Changed the base mapping along with moved generic controller to separate
package

Signed-off-by: madhusmita <madhusmitap@mindfiresolutions.com>