Rearranged files to fit directory-structure and updated makefile