Changes to classes so they match glossary. Also removed EditPageActivity.java