Changes made as of 21 September

rearranged folder structure and added new folders.