Module and app cleanup

@davearel @aj-self Please review