adapted namespace declarations of new files