split classes, add autoloader, cleanup