(Mod) Makefile cleanup
(Mod) Use lambda as a hook
(Mod) Splitting load/serialize