renamed files to reflect new namespace
fixed wrong namespace