Got rid of old makefile, added new one for managing oasis