With the addition of moderation commands coming up, it will be good having a clear separation of separate features both in code as well as in the way the files themselves are organized. This code change will be coming soon.