re-structure dirs package