Added new file/directory structure