Refactoring package - creating main package