moved app into app dir
updated for new site