Bump directory and class structure