removed packages in Main for easy handling