add namespaces, remove requires, remove .inc from filenames