Added notify stub, moved some stuff around
Changed file headers slightly