add public folder
Add underscore
find correct names