Keep app/, more importantly figure out weird git issue.