Updated wrappers
Modified Makefile
Changed file structure