Moving storage related code to the appropriate foleder