Removed ClassFile and replaced with Forum; updated layout