Restructuring namespaced folders so that we don't get filename too long errors