App structure, glue.php improved.