Move file related mothods to correct place