#96 #130 Restructure the ModernBB core