fix comments
rename and move api files