Rearranging to include some subdirectories.