Restore Makefile.am
Refactoring