Restructure with make file