rename repositories dir and namespaces to singular