Massive refactory due to creation of L2MerakData module