Fixing the directory structure and naming