Reorganized and refactored makefiles.
Added tier1.