[Fix #145] Refactor Make to App