Restructured & renamed some classes