Trying to fix directory structure