Refactor, use subdirectories.