Reworked files, updated the makefile.