Moved start and watch to separated projects