remove redundant concern folder
refactor, add activity availablility