Make more conventional class names and add autoloader