Add #5223 by Henry: Add all main app files