Issue80 general dir

Closes #80. Refactored general directory to remove some things that are functioning as components. A new directory called `components` has been made to contain these items. Tests, references to templates, etc have been adjusted accordingly.