Updated main src and cleaned up BasicSample