change trunk to barrier_breaker and cleanup build file