Libmarpa refactoring
Libmarpa refactoring: t+
Libmarpa refactoring: t+