Moved RunsafeItem to correct place, extended Entity and implemented missing functions