re-structure, move into its folder