Changed subdirectory structure.