Moved app stuff into app/