Reorganizing functions in subdirectories.