move to the correct namespace
add the autoloader
add tests