refractoring to be in compliance with package naming convetions