restructure post fixes, update Makefile to work with new structure