rename files
add namespace and rename class