Added single object structure, updated makefile