Initial layout finished, Makefile fixed..