move folders out of app and to root