Consolidated classes better in preparation to improve loading speed

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>