Got rid of redundant directory level