Restructure Makfiles