Edited the structure to reflect latest changes to requirements