Move topic to lib/topic/ folder