Removed unneeded level of directory structure