moving package stuff into its own folder