resolving the unwanted dependency and structurised the package structure