Moving implementation content into proper directory