Refactor/activity restructure