tidied up how questions are defined and imported into the system. States are now added properly async and have renamed some files for better visibility of their function in the system