[app] movin stuff around