Refactored so that form uses hook_form_FORM_ID_alter, renamed directories for consistency