Revert "Restructure Makefile"

This reverts commit 683cb5ec6f7138ac7353fff25186b1c81ed6c80f.