Removed redundant sub-folder structure