Restructure, one more homepage make file fix