moving app stuff into app dir