Re-organize in subdirectories.