renamed package and also refactored packages structure