Started code refactor to prepare for beta release including content-aware changes.