Dynamic structure is on its way.
Added more to Makefiles.