Move files into app directory for proper structure