reorganized topics module files so they align with recommended best practice.