Include better application structure