Project revamp, clean start with single activity