move file content to proper file
Improve setting